Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 21:51:07 +0000 (13:51 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 21:51:07 +0000 (13:51 -0800)
commite7626dbe33299463c187eb07ad019216f0fc4023
tree7844b03df20567c5b95d3123468431bddcce628c
parent61802c7ec4524843a0398956bbb54d647b5b26ff
parentbd80821be5a71a81f278124c61178d308a337b5f
Merge from trunk.